Namespace the enum values properly. Sorry about the resize grip trouble,

2003-08-25  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkactiongroup.h (GtkActionGroupEntryType): Namespace the enum
	values properly. Sorry about the resize grip trouble, Owen.  (#120621)

	* gtk/gtkactiongroup.c:
	* demos/gtk-demo/appwindow.c:
	* tests/testmerge.c:
	* tests/testactions.c: Use new GtkActionGroupEntryType enum.

diff --git a/ChangeLog b/ChangeLog
index d826ca06076254cdedfe3d216b3533f27a9d9644..1c6e7d3aafdb9c37defa2784b354519dd1cdd8bb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2003-08-25  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkactiongroup.h (GtkActionGroupEntryType): Namespace the enum
+       values properly. Sorry about the resize grip trouble, Owen.  (#120621)
+
+       * gtk/gtkactiongroup.c: 
+       * demos/gtk-demo/appwindow.c: 
+       * tests/testmerge.c: 
+       * tests/testactions.c: Use new GtkActionGroupEntryType enum.  
+
 Sun Aug 24 17:14:44 2003  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtk.h: Remove reference to gtkresizegrip.h.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d826ca06076254cdedfe3d216b3533f27a9d9644..1c6e7d3aafdb9c37defa2784b354519dd1cdd8bb 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+2003-08-25  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkactiongroup.h (GtkActionGroupEntryType): Namespace the enum
+       values properly. Sorry about the resize grip trouble, Owen.  (#120621)
+
+       * gtk/gtkactiongroup.c: 
+       * demos/gtk-demo/appwindow.c: 
+       * tests/testmerge.c: 
+       * tests/testactions.c: Use new GtkActionGroupEntryType enum.  
+
 Sun Aug 24 17:14:44 2003  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtk.h: Remove reference to gtkresizegrip.h.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d826ca06076254cdedfe3d216b3533f27a9d9644..1c6e7d3aafdb9c37defa2784b354519dd1cdd8bb 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,13 @@
+2003-08-25  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkactiongroup.h (GtkActionGroupEntryType): Namespace the enum
+       values properly. Sorry about the resize grip trouble, Owen.  (#120621)
+
+       * gtk/gtkactiongroup.c: 
+       * demos/gtk-demo/appwindow.c: 
+       * tests/testmerge.c: 
+       * tests/testactions.c: Use new GtkActionGroupEntryType enum.  
+
 Sun Aug 24 17:14:44 2003  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtk.h: Remove reference to gtkresizegrip.h.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d826ca06076254cdedfe3d216b3533f27a9d9644..1c6e7d3aafdb9c37defa2784b354519dd1cdd8bb 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+2003-08-25  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkactiongroup.h (GtkActionGroupEntryType): Namespace the enum
+       values properly. Sorry about the resize grip trouble, Owen.  (#120621)
+
+       * gtk/gtkactiongroup.c: 
+       * demos/gtk-demo/appwindow.c: 
+       * tests/testmerge.c: 
+       * tests/testactions.c: Use new GtkActionGroupEntryType enum.  
+
 Sun Aug 24 17:14:44 2003  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtk.h: Remove reference to gtkresizegrip.h.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d826ca06076254cdedfe3d216b3533f27a9d9644..1c6e7d3aafdb9c37defa2784b354519dd1cdd8bb 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+2003-08-25  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkactiongroup.h (GtkActionGroupEntryType): Namespace the enum
+       values properly. Sorry about the resize grip trouble, Owen.  (#120621)
+
+       * gtk/gtkactiongroup.c: 
+       * demos/gtk-demo/appwindow.c: 
+       * tests/testmerge.c: 
+       * tests/testactions.c: Use new GtkActionGroupEntryType enum.  
+
 Sun Aug 24 17:14:44 2003  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtk.h: Remove reference to gtkresizegrip.h.

diff --git a/demos/gtk-demo/appwindow.c b/demos/gtk-demo/appwindow.c
index ac036877480141fc5a26bf2b99d4829c9f559360..88742cc13b5446c2fc2fd72cdff30a4c2e00e8d6 100644 (file)
--- a/demos/gtk-demo/appwindow.c
+++ b/demos/gtk-demo/appwindow.c
@@ -50,13 +50,13 @@ static GtkActionGroupEntry entries[] = {
   { "SaveAs", N_("Save _As..."), GTK_STOCK_SAVE, NULL, N_("Save to a file"), G_CALLBACK (activate_action), NULL },
   { "Quit", N_("_Quit"), GTK_STOCK_QUIT, "<control>Q", N_("Quit"), G_CALLBACK (activate_action), NULL },
 
-  { "Red", N_("_Red"), NULL, "<control>R", N_("Blood"), G_CALLBACK (activate_action), NULL, RADIO_ACTION },
-  { "Green", N_("_Green"), NULL, "<control>G", N_("Grass"), G_CALLBACK (activate_action), NULL, RADIO_ACTION, "Red" },
-  { "Blue", N_("_Blue"), NULL, "<control>B", N_("Sky"), G_CALLBACK (activate_action), NULL, RADIO_ACTION, "Red" },
+  { "Red", N_("_Red"), NULL, "<control>R", N_("Blood"), G_CALLBACK (activate_action), NULL, GTK_ACTION_RADIO },
+  { "Green", N_("_Green"), NULL, "<control>G", N_("Grass"), G_CALLBACK (activate_action), NULL, GTK_ACTION_RADIO, "Red" },
+  { "Blue", N_("_Blue"), NULL, "<control>B", N_("Sky"), G_CALLBACK (activate_action), NULL, GTK_ACTION_RADIO, "Red" },
 
-  { "Square", N_("_Square"), NULL, "<control>S", N_("Square"), G_CALLBACK (activate_action), NULL, RADIO_ACTION },
-  { "Rectangle", N_("_Rectangle"), NULL, "<control>R", N_("Rectangle"), G_CALLBACK (activate_action), NULL, RADIO_ACTION, "Square" },
-  { "Oval", N_("_Oval"), NULL, "<control>O", N_("Egg"), G_CALLBACK (activate_action), NULL, RADIO_ACTION, "Square" },
+  { "Square", N_("_Square"), NULL, "<control>S", N_("Square"), G_CALLBACK (activate_action), NULL, GTK_ACTION_RADIO },
+  { "Rectangle", N_("_Rectangle"), NULL, "<control>R", N_("Rectangle"), G_CALLBACK (activate_action), NULL, GTK_ACTION_RADIO, "Square" },
+  { "Oval", N_("_Oval"), NULL, "<control>O", N_("Egg"), G_CALLBACK (activate_action), NULL, GTK_ACTION_RADIO, "Square" },
   { "About", N_("_About"), NULL, "<control>A", N_("About"), G_CALLBACK (activate_action), NULL },
   { "Logo", NULL, "demo-gtk-logo", NULL, N_("GTK+"), G_CALLBACK (activate_action), NULL },
 };

diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c
index 69122755efd3d0b5d900bf25dc678e13526fd129..28ae218b32cd8cb9ef0c701970dfcd0e15756483 100644 (file)
--- a/gtk/gtkactiongroup.c
+++ b/gtk/gtkactiongroup.c
@@ -290,13 +290,13 @@ gtk_action_group_add_actions (GtkActionGroup      *action_group,
       gchar *accel_path;
 
       switch (entries[i].entry_type) {
-      case NORMAL_ACTION:
+      case GTK_ACTION_NORMAL:
        action_type = GTK_TYPE_ACTION;
        break;
-      case TOGGLE_ACTION:
+      case GTK_ACTION_TOGGLE:
        action_type = GTK_TYPE_TOGGLE_ACTION;
        break;
-      case RADIO_ACTION:
+      case GTK_ACTION_RADIO:
        action_type = GTK_TYPE_RADIO_ACTION;
        break;
       default:
@@ -311,7 +311,7 @@ gtk_action_group_add_actions (GtkActionGroup      *action_group,
                             "stock_id", entries[i].stock_id,
                             NULL);
 
-      if (entries[i].entry_type == RADIO_ACTION &&
+      if (entries[i].entry_type == GTK_ACTION_RADIO &&
          entries[i].extra_data != NULL)
        {
          GtkAction *radio_action;

diff --git a/gtk/gtkactiongroup.h b/gtk/gtkactiongroup.h
index 523b05387fb89f8ba276045947900684de972ada..1489006d858ab97213b72b345be68ebdce6a2fd5 100644 (file)
--- a/gtk/gtkactiongroup.h
+++ b/gtk/gtkactiongroup.h
@@ -69,9 +69,9 @@ struct _GtkActionGroupClass
 
 typedef enum 
 {
-  NORMAL_ACTION,
-  TOGGLE_ACTION,
-  RADIO_ACTION
+  GTK_ACTION_NORMAL,
+  GTK_ACTION_TOGGLE,
+  GTK_ACTION_RADIO
 } GtkActionGroupEntryType;
 
 struct _GtkActionGroupEntry 

diff --git a/tests/testactions.c b/tests/testactions.c
index b5e1f6c7d1e00b00751419dae63db0c6deaaf88d..d2d1be33a1c1948a0a5ae60ce67b76afc7c02359 100644 (file)
--- a/tests/testactions.c
+++ b/tests/testactions.c
@@ -94,41 +94,41 @@ static GtkActionGroupEntry entries[] = {
     G_CALLBACK (activate_action), NULL },
   { "bold", N_("_Bold"), GTK_STOCK_BOLD, "<control>B",
     N_("Change to bold face"),
-    G_CALLBACK (toggle_action), NULL, TOGGLE_ACTION },
+    G_CALLBACK (toggle_action), NULL, GTK_ACTION_TOGGLE },
 
   { "justify-left", N_("_Left"), GTK_STOCK_JUSTIFY_LEFT, "<control>L",
     N_("Left justify the text"),
-    G_CALLBACK (toggle_action), NULL, RADIO_ACTION },
+    G_CALLBACK (toggle_action), NULL, GTK_ACTION_RADIO },
   { "justify-center", N_("C_enter"), GTK_STOCK_JUSTIFY_CENTER, "<control>E",
     N_("Center justify the text"),
-    G_CALLBACK (toggle_action), NULL, RADIO_ACTION, "justify-left" },
+    G_CALLBACK (toggle_action), NULL, GTK_ACTION_RADIO, "justify-left" },
   { "justify-right", N_("_Right"), GTK_STOCK_JUSTIFY_RIGHT, "<control>R",
     N_("Right justify the text"),
-    G_CALLBACK (toggle_action), NULL, RADIO_ACTION, "justify-left" },
+    G_CALLBACK (toggle_action), NULL, GTK_ACTION_RADIO, "justify-left" },
   { "justify-fill", N_("_Fill"), GTK_STOCK_JUSTIFY_FILL, "<control>J",
     N_("Fill justify the text"),
-    G_CALLBACK (toggle_action), NULL, RADIO_ACTION, "justify-left" },
+    G_CALLBACK (toggle_action), NULL, GTK_ACTION_RADIO, "justify-left" },
   { "quit", NULL, GTK_STOCK_QUIT, "<control>Q",
     N_("Quit the application"),
     G_CALLBACK (gtk_main_quit), NULL },
   { "toggle-cnp", N_("Enable Cut/Copy/Paste"), NULL, NULL,
     N_("Change the sensitivity of the cut, copy and paste actions"),
-    G_CALLBACK (toggle_cnp_actions), NULL, TOGGLE_ACTION },
+    G_CALLBACK (toggle_cnp_actions), NULL, GTK_ACTION_TOGGLE },
   { "customise-accels", N_("Customise _Accels"), NULL, NULL,
     N_("Customise keyboard shortcuts"),
     G_CALLBACK (show_accel_dialog), NULL },
   { "toolbar-icons", N_("Icons"), NULL, NULL,
     NULL, G_CALLBACK (toolbar_style), GINT_TO_POINTER (GTK_TOOLBAR_ICONS),
-    RADIO_ACTION, NULL },
+    GTK_ACTION_RADIO, NULL },
   { "toolbar-text", N_("Text"), NULL, NULL,
     NULL, G_CALLBACK (toolbar_style), GINT_TO_POINTER (GTK_TOOLBAR_TEXT),
-    RADIO_ACTION, "toolbar-icons" },
+    GTK_ACTION_RADIO, "toolbar-icons" },
   { "toolbar-both", N_("Both"), NULL, NULL,
     NULL, G_CALLBACK (toolbar_style), GINT_TO_POINTER (GTK_TOOLBAR_BOTH),
-    RADIO_ACTION, "toolbar-icons" },
+    GTK_ACTION_RADIO, "toolbar-icons" },
   { "toolbar-both-horiz", N_("Both Horizontal"), NULL, NULL,
     NULL, G_CALLBACK (toolbar_style), GINT_TO_POINTER(GTK_TOOLBAR_BOTH_HORIZ),
-    RADIO_ACTION, "toolbar-icons" },
+    GTK_ACTION_RADIO, "toolbar-icons" },
   { "toolbar-small-icons", N_("Small Icons"), NULL, NULL,
     NULL,
     G_CALLBACK (toolbar_size), GINT_TO_POINTER (GTK_ICON_SIZE_SMALL_TOOLBAR) },

diff --git a/tests/testmerge.c b/tests/testmerge.c
index 8e501af7a327e5e9ea81278fd9e6cfab6748afcf..a352f3866a820b0f816f8c8848d996258625cee5 100644 (file)
--- a/tests/testmerge.c
+++ b/tests/testmerge.c
@@ -66,16 +66,16 @@ static GtkActionGroupEntry entries[] = {
     G_CALLBACK (activate_action), NULL },
   { "justify-left", NULL, GTK_STOCK_JUSTIFY_LEFT, "<control>L",
     N_("Left justify the text"),
-    G_CALLBACK (toggle_action), NULL, RADIO_ACTION, NULL },
+    G_CALLBACK (toggle_action), NULL, GTK_ACTION_RADIO, NULL },
   { "justify-center", NULL, GTK_STOCK_JUSTIFY_CENTER, "<control>E",
     N_("Center justify the text"),
-    G_CALLBACK (toggle_action), NULL, RADIO_ACTION, "justify-left" },
+    G_CALLBACK (toggle_action), NULL, GTK_ACTION_RADIO, "justify-left" },
   { "justify-right", NULL, GTK_STOCK_JUSTIFY_RIGHT, "<control>R",
     N_("Right justify the text"),
-    G_CALLBACK (toggle_action), NULL, RADIO_ACTION, "justify-left" },
+    G_CALLBACK (toggle_action), NULL, GTK_ACTION_RADIO, "justify-left" },
   { "justify-fill", NULL, GTK_STOCK_JUSTIFY_FILL, "<control>J",
     N_("Fill justify the text"),
-    G_CALLBACK (toggle_action), NULL, RADIO_ACTION, "justify-left" },
+    G_CALLBACK (toggle_action), NULL, GTK_ACTION_RADIO, "justify-left" },
   { "AboutAction", N_("_About"), NULL, NULL, NULL,
     G_CALLBACK (activate_action), NULL },
 };